applications: nrf_desktop: turn on BT_ID_AUTO_SWAP_MATCHING_BONDS #23094

zycz · 2025-07-02T14:13:55Z

Allow bonding with the same HID host on
multiple Bluetooth local identities.

JIRA: NCSDK-32518

NordicBuilder · 2025-07-02T14:18:46Z

CI Information

^{To view the history of this post, clich the 'edited' button above}
Build number: 12

Inputs:

Sources:

sdk-nrf: PR head: 0afef3c132bd0c15993afc35350670619c7fd7ed

more details

sdk-nrf:

PR head: 0afef3c132bd0c15993afc35350670619c7fd7ed
merge base: 30c6c4a23f8dbc82fd96a16728265cde514f0985
target head (main): a62d535996caca5e1ce3ded8334df5cf6327aabc
Diff

Github labels

Enabled	Name	Description
	ci-disabled	Disable the ci execution
	ci-all-test	Run all of ci, no test spec filtering will be done
	ci-force-downstream	Force execution of downstream even if twister fails
	ci-run-twister	Force run twister
	ci-run-zephyr-twister	Force run zephyr twister

List of changed files detected by CI (1)

applications
│  ├── nrf_desktop
│  │  │ Kconfig.ble

Outputs:

Toolchain

Version: 11ad62c2a5
Build docker image: docker-dtr.nordicsemi.no/sw-production/ncs-build:11ad62c2a5_bba2ea5f2e

Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped; ⚠️ Quarantine

◻️ Toolchain - Skipped: existing toolchain is used
✅ Build twister
- sdk-nrf test count: 49
✅ Integration tests
- ✅ desktop52_verification

Disabled integration tests

- test-fw-nrfconnect-nrf_lrcs_mosh
- test-fw-nrfconnect-nrf_lrcs_positioning
- doc-internal
- test_ble_nrf_config
- test-fw-nrfconnect-apps
- test-fw-nrfconnect-ble_mesh
- test-fw-nrfconnect-ble_samples
- test-fw-nrfconnect-chip
- test-fw-nrfconnect-fem
- test-fw-nrfconnect-nfc
- test-fw-nrfconnect-nrf-iot_cloud
- test-fw-nrfconnect-nrf-iot_libmodem-nrf
- test-fw-nrfconnect-nrf-iot_lwm2m
- test-fw-nrfconnect-nrf-iot_samples
- test-fw-nrfconnect-nrf-iot_serial_lte_modem
- test-fw-nrfconnect-nrf-iot_thingy91
- test-fw-nrfconnect-nrf-iot_zephyr_lwm2m
- test-fw-nrfconnect-nrf_crypto
- test-fw-nrfconnect-ps-main
- test-fw-nrfconnect-rpc
- test-fw-nrfconnect-rs
- test-fw-nrfconnect-tfm
- test-fw-nrfconnect-thread-main
- test-low-level
- test-sdk-audio
- test-sdk-dfu
- test-sdk-find-my
- test-sdk-mcuboot
- test-sdk-pmic-samples
- test-sdk-wifi
- test-secdom-samples-public

Note: This message is automatically posted and updated by the CI

github-actions · 2025-07-02T14:40:04Z

You can find the documentation preview for this PR here.

MarekPieta · 2025-07-02T14:16:42Z

applications/nrf_desktop/Kconfig.ble

Please don't imply CONFIG_BT_PRIVACY (not needed for most of the use-cases). You could simply imply BT_ID_AUTO_SWAP_MATCHING_BONDS (or conditionally overwrite default) if needed. Please also add description under Kconfig help.

btw. Can BLE peripheral without privacy also bond with the same peer on multiple BLE local identities (this use-case is relevant for nRF Desktop too)?

MarekPieta · 2025-07-02T14:17:22Z

applications/nrf_desktop/Kconfig.ble

Whole entry can be removed

ok, great I thought about it and wanted your opinion on that

No need to overwrite default with the same value

MarekPieta · 2025-07-02T14:22:05Z

doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst

Please include reference to the Kconfig option and mention that application overwrites Kconfig default for nRF Desktop peripheral.

divipillai · 2025-07-03T09:54:52Z

doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst

Suggested change

* The :kconfig:option:`CONFIG_BT_ID_AUTO_SWAP_MATCHING_BONDS` Kconfig option in implied options for nRF Desktop peripherals.

* The :kconfig:option:`CONFIG_BT_ID_AUTO_SWAP_MATCHING_BONDS` Kconfig option as an imply for nRF Desktop peripherals.

reviver on a sick leave

zycz · 2025-07-29T15:23:49Z

Add DNM as waiting for: https://github.com/zephyrproject-rtos/zephyr/pull/93821/files

NordicBuilder · 2025-07-29T15:41:37Z

Memory footprint analysis revealed the following potential issues

applications.nrf_desktop.zdebug.uart[nrf54lm20dk/nrf54lm20a/cpuapp]: ROM size increased by 968[B] in comparison to the main[30c6c4a] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zdebug.uart[[email protected]/nrf54lm20a/cpuapp]: ROM size increased by 960[B] in comparison to the main[30c6c4a] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zdebug.uart[[email protected]/nrf54lm20a/cpuapp]: ROM size increased by 960[B] in comparison to the main[30c6c4a] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zdebug.usb_next[nrf52840dk/nrf52840]: ROM size increased by 1940[B] in comparison to the main[30c6c4a] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zdebug.usb_next[nrf52840gmouse/nrf52840]: ROM size increased by 1640[B] in comparison to the main[30c6c4a] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zdebug[nrf52840dk/nrf52840]: ROM size increased by 2052[B] in comparison to the main[30c6c4a] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zdebug[nrf52840gmouse/nrf52840]: ROM size increased by 1928[B] in comparison to the main[30c6c4a] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zdebug[nrf52dmouse/nrf52832]: ROM size increased by 1264[B] in comparison to the main[30c6c4a] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zdebug[nrf52kbd/nrf52832]: ROM size increased by 1276[B] in comparison to the main[30c6c4a] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zdebug[nrf54l15dk/nrf54l05/cpuapp]: ROM size increased by 1560[B] in comparison to the main[30c6c4a] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zdebug_fast_pair.gmouse[nrf52840gmouse/nrf52840]: ROM size increased by 1816[B] in comparison to the main[30c6c4a] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zdebug_keyboard.usb_next[nrf52840dk/nrf52840]: ROM size increased by 1292[B] in comparison to the main[30c6c4a] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zdebug_keyboard[nrf52840dk/nrf52840]: ROM size increased by 1280[B] in comparison to the main[30c6c4a] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zdebug_mcuboot_qspi[nrf52840dk/nrf52840]: ROM size increased by 2040[B] in comparison to the main[30c6c4a] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zdebug_mcuboot_smp[nrf52840dk/nrf52840]: ROM size increased by 2012[B] in comparison to the main[30c6c4a] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zdebug_nrf21540ek[nrf52840dk/nrf52840]: ROM size increased by 2048[B] in comparison to the main[30c6c4a] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zdebug_wwcb[nrf52840dk/nrf52840]: ROM size increased by 1960[B] in comparison to the main[30c6c4a] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zdebugwithshell[nrf52840dk/nrf52840]: ROM size increased by 2064[B] in comparison to the main[30c6c4a] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zrelease.usb_next[nrf52840dk/nrf52840]: ROM size increased by 512[B] in comparison to the main[30c6c4a] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zrelease[nrf52kbd/nrf52832]: ROM size increased by 624[B] in comparison to the main[30c6c4a] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zrelease[nrf54l15dk/nrf54l15/cpuapp]: ROM size increased by 788[B] in comparison to the main[30c6c4a] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zrelease_fast_pair.gmouse[nrf54l15dk/nrf54l05/cpuapp]: ROM size increased by 912[B] in comparison to the main[30c6c4a] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zrelease_fast_pair.keyboard[nrf52kbd/nrf52832]: ROM size increased by 640[B] in comparison to the main[30c6c4a] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zrelease_keyboard[nrf54l15dk/nrf54l05/cpuapp]: ROM size increased by 880[B] in comparison to the main[30c6c4a] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)

Note: This message is automatically posted and updated by the CI (latest/sdk-nrf/PR-23094/12)

alstrzebonski · 2025-07-30T12:34:16Z

doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst

Please describe removal of CONFIG_ BT_ID_UNPAIR_MATCHING_BONDS

PavelVPV

LGTM

kapi-no · 2025-07-31T07:20:03Z

doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst

Suggested change

* The :kconfig:option:`CONFIG_BT_ID_AUTO_SWAP_MATCHING_BONDS` Kconfig option as an imply for Fast Pair nRF Desktop peripherals.

The option allows the application to automatically swap matching bonds when the Bluetooth local identity changes.

Due to that change and change in the zephyr host smp module, the nRF Desktop application no longer requires the :kconfig:option:`CONFIG_ BT_ID_UNPAIR_MATCHING_BONDS` Kconfig option to be enabled.

Removing it enables the possibility for bonding with the same HID host on multiple Bluetooth local identities for all nRF Desktop peripherals.

* The :kconfig:option:`CONFIG_BT_ID_AUTO_SWAP_MATCHING_BONDS` Kconfig option as an imply to the :kconfig:option:`CONFIG_DESKTOP_BT_PERIPHERAL` Kconfig option.

As a result, all nRF Desktop Fast Pair configurations have the :kconfig:option:`CONFIG_BT_ID_AUTO_SWAP_MATCHING_BONDS` Kconfig option enabled by default.

The option allows the application to automatically swap matching bonds when the Bluetooth local identity changes and the Bluetooth Privacy feature (:kconfig:option:`CONFIG_BT_PRIVACY`) is enabled.

Build configurations without the Bluetooth Privacy feature support the bond swapping without any dedicated Kconfig option.

Due to that change and change in the SMP layer of the Zephyr Bluetooth stack, the nRF Desktop application no longer requires the :kconfig:option:`CONFIG_BT_ID_UNPAIR_MATCHING_BONDS` Kconfig option to be enabled.

Removing it enables the possibility for bonding with the same HID host on multiple Bluetooth local identities for all nRF Desktop peripherals.

kapi-no · 2025-07-31T07:22:02Z

applications/nrf_desktop/Kconfig.ble

Add a help section paragraph to explain why this is needed

zycz · 2025-08-01T08:29:23Z

Waiting for: nrfconnect/sdk-zephyr#3117

zycz · 2025-08-01T11:40:33Z

Not needing FAST PAIR to turn on CONFIG_BT_ID_AUTO_SWAP_MATCHING_BONDS.
The CONFIG_BT_PRIVACY option configures the local device to use privacy features, but it still allows address resolution for peer devices. During pairing, the peer may provide its Identity Address and IRK, which can be used for address resolution regardless of whether CONFIG_BT_PRIVACY is enabled.

applications/nrf_desktop/Kconfig.ble

doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst

divipillai · 2025-08-04T10:21:05Z

doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst

Please add a comment on PR #23631, if this change is for the 3.1.0 release, and remove the entry from this PR.
Also, add the backport label.

Added comment under #23631
Also removed changelog entry.
Added backport 3.1 label.

Allow bonding with the same HID host on multiple Bluetooth local identities. JIRA: NCSDK-32518 Signed-off-by: Jan Zyczkowski <[email protected]>

zycz requested review from a team as code owners July 2, 2025 14:13

github-actions bot added the doc-required PR must not be merged without tech writer approval. label Jul 2, 2025

MarekPieta previously requested changes Jul 2, 2025

View reviewed changes

zycz force-pushed the issue32518_multiple_identities branch from b76db03 to d044228 Compare July 3, 2025 07:44

divipillai reviewed Jul 3, 2025

View reviewed changes

richabp self-requested a review July 9, 2025 13:23

zycz force-pushed the issue32518_multiple_identities branch 2 times, most recently from bd2ac83 to 03133d5 Compare July 29, 2025 15:19

zycz added the DNM label Jul 29, 2025

alstrzebonski requested changes Jul 30, 2025

View reviewed changes

PavelVPV approved these changes Jul 30, 2025

View reviewed changes

zycz force-pushed the issue32518_multiple_identities branch 2 times, most recently from 1d73d30 to 9b90d7a Compare July 30, 2025 15:54

alstrzebonski approved these changes Jul 30, 2025

View reviewed changes

divipillai approved these changes Jul 31, 2025

View reviewed changes

kapi-no requested changes Jul 31, 2025

View reviewed changes

kapi-no reviewed Jul 31, 2025

View reviewed changes

kapi-no added this to the 3.1.0 milestone Jul 31, 2025

nordicjm approved these changes Jul 31, 2025

View reviewed changes

zycz force-pushed the issue32518_multiple_identities branch 2 times, most recently from eba1066 to 54de8a9 Compare August 1, 2025 06:58

zycz force-pushed the issue32518_multiple_identities branch from 54de8a9 to 778d53b Compare August 1, 2025 11:37

zycz requested a review from kapi-no August 1, 2025 11:37

zycz requested a review from alstrzebonski August 1, 2025 11:37

alstrzebonski approved these changes Aug 1, 2025

View reviewed changes

kapi-no reviewed Aug 1, 2025

View reviewed changes

applications/nrf_desktop/Kconfig.ble Outdated Show resolved Hide resolved

doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst Outdated Show resolved Hide resolved

doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst Outdated Show resolved Hide resolved

zycz force-pushed the issue32518_multiple_identities branch from 778d53b to 5c5eec1 Compare August 1, 2025 12:00

zycz requested a review from kapi-no August 1, 2025 12:00

zycz force-pushed the issue32518_multiple_identities branch from 5c5eec1 to 820798f Compare August 1, 2025 12:13

kapi-no approved these changes Aug 1, 2025

View reviewed changes

zycz mentioned this pull request Aug 1, 2025

manifest: sdk-zephyr: [nrf noup] bluetooth: host: Allow auto swap feature without privacy #23599

Closed

pdunaj approved these changes Aug 4, 2025

View reviewed changes

PavelVPV approved these changes Aug 4, 2025

View reviewed changes

divipillai reviewed Aug 4, 2025

View reviewed changes

applications: nrf_desktop: turn on BT_ID_AUTO_SWAP_MATCHING_BONDS

0afef3c

Allow bonding with the same HID host on multiple Bluetooth local identities. JIRA: NCSDK-32518 Signed-off-by: Jan Zyczkowski <[email protected]>

zycz force-pushed the issue32518_multiple_identities branch from 820798f to 0afef3c Compare August 4, 2025 14:28

github-actions bot added changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. and removed doc-required PR must not be merged without tech writer approval. labels Aug 4, 2025

zycz added backport v3.1-branch and removed DNM changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels Aug 4, 2025

divipillai approved these changes Aug 4, 2025

View reviewed changes

rlubos merged commit 076057e into nrfconnect:main Aug 4, 2025
17 of 18 checks passed

NordicBuilder mentioned this pull request Aug 4, 2025

[Backport v3.1-branch] applications: nrf_desktop: turn on BT_ID_AUTO_SWAP_MATCHING_BONDS #23690

Merged

	* The :kconfig:option:`CONFIG_BT_ID_AUTO_SWAP_MATCHING_BONDS` Kconfig option in implied options for nRF Desktop peripherals.
	* The :kconfig:option:`CONFIG_BT_ID_AUTO_SWAP_MATCHING_BONDS` Kconfig option as an imply for nRF Desktop peripherals.

-  * The :kconfig:option:`CONFIG_BT_ID_AUTO_SWAP_MATCHING_BONDS` Kconfig option as an imply for Fast Pair nRF Desktop peripherals.
-    The option allows the application to automatically swap matching bonds when the Bluetooth local identity changes.
-    Due to that change and change in the zephyr host smp module, the nRF Desktop application no longer requires the :kconfig:option:`CONFIG_ BT_ID_UNPAIR_MATCHING_BONDS` Kconfig option to be enabled.
-    Removing it enables the possibility for bonding with the same HID host on multiple Bluetooth local identities for all nRF Desktop peripherals.
+  * The :kconfig:option:`CONFIG_BT_ID_AUTO_SWAP_MATCHING_BONDS` Kconfig option as an imply to the :kconfig:option:`CONFIG_DESKTOP_BT_PERIPHERAL` Kconfig option.
+    As a result, all nRF Desktop Fast Pair configurations have the :kconfig:option:`CONFIG_BT_ID_AUTO_SWAP_MATCHING_BONDS` Kconfig option enabled by default.
+    The option allows the application to automatically swap matching bonds when the Bluetooth local identity changes and the Bluetooth Privacy feature (:kconfig:option:`CONFIG_BT_PRIVACY`)  is enabled.
+    Build configurations without the Bluetooth Privacy feature support the bond swapping without any dedicated Kconfig option.
+    Due to that change and change in the SMP layer of the Zephyr Bluetooth stack, the nRF Desktop application no longer requires the :kconfig:option:`CONFIG_BT_ID_UNPAIR_MATCHING_BONDS` Kconfig option to be enabled.
+    Removing it enables the possibility for bonding with the same HID host on multiple Bluetooth local identities for all nRF Desktop peripherals.

applications: nrf_desktop: turn on BT_ID_AUTO_SWAP_MATCHING_BONDS #23094

applications: nrf_desktop: turn on BT_ID_AUTO_SWAP_MATCHING_BONDS #23094

Uh oh!

Conversation

zycz commented Jul 2, 2025

Uh oh!

NordicBuilder commented Jul 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

CI Information

Inputs:

Sources:

Github labels

Outputs:

Toolchain

Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped; ⚠️ Quarantine

Uh oh!

github-actions bot commented Jul 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

zycz commented Jul 29, 2025

Uh oh!

NordicBuilder commented Jul 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Memory footprint analysis revealed the following potential issues

Uh oh!

Choose a reason for hiding this comment

Uh oh!

PavelVPV left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

zycz commented Aug 1, 2025

Uh oh!

zycz commented Aug 1, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

NordicBuilder commented Jul 2, 2025 •

edited

Loading

github-actions bot commented Jul 2, 2025 •

edited

Loading

NordicBuilder commented Jul 29, 2025 •

edited

Loading